Merge from trunk
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 18 Nov 2011 17:57:31 +0000 (09:57 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 18 Nov 2011 17:57:31 +0000 (09:57 -0800)

Trivial merge